diff --git a/flake.nix b/flake.nix
index bd72b2f..465eb7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,8 +49,8 @@
           system = "x86_64-linux";
           config.allowUnfree = true;
           modules = [
-            nixos-hardware.common-cpu-amd
-            nixos-hardware.common-gpu-nvidia-nonprime
+            nixos-hardware.nixosModules.common-cpu-amd
+            nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
             ./systems/BASED.nix
             ./systems/NOcomputer.nix
             # ./users/tao.nix
@@ -69,14 +69,20 @@
           system = "x86_64-linux";
           config.allowUnfree = true;
           modules = [
-            #   nixos-hw.common-cpu-intel
-            #   # inputs.nixos-hardware.nixosModules.framework
-            #   ./systems/BASED.nix
-            #   ./systems/NOlaptop.nix
-            #   ./users/tao.nix
-            #   ./extras/uwuraid.nix
-            #   ./extras/dev.nix
-            #   ./extras/gaming.nix
+            nixos-hardware.nixosModules.common-cpu-intel
+            # inputs.nixos-hardware.nixosModules.framework
+            ./systems/BASED.nix
+            ./systems/NOlaptop.nix
+            # ./users/tao.nix
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.jdoe = import ./tao.nix;
+            }
+            ./extras/uwuraid.nix
+            ./extras/dev.nix
+            ./extras/gaming.nix
           ];
         };
         # NOcomputer = nixos-system [