diff --git a/configuration.nix b/configuration.nix
index 2abdcd9..288dbc8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -161,6 +161,5 @@ in
 
   	system.stateVersion = "unstable"; 
 	
-	home-manager.users.fabian = import ./modules/home.nix;
 }
 
diff --git a/flake.lock b/flake.lock
index fb8337f..1dd3478 100644
--- a/flake.lock
+++ b/flake.lock
@@ -128,7 +128,9 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1726989464,
@@ -217,18 +219,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716542732,
-        "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=",
+        "lastModified": 1731139594,
+        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60",
+        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
       }
     },
     "nixpkgs-stable": {
@@ -246,21 +247,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -315,7 +301,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixvim": "nixvim"
       }
diff --git a/flake.nix b/flake.nix
index 4a1efda..0bb57d2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,19 +22,22 @@
         nixosConfigurations = {
             poggers = lib.nixosSystem {
                 inherit system;
-                modules = [ ./configuration.nix ];
+                modules = [ 
+                    ./configuration.nix 
+                    home-manager.nixosModules.home-manager
+                    {
+                        home-manager.users.fabian = import ./modules/home.nix;
+                        home-manager.extraSpecialArgs = {
+                            inherit nixvim;
+                            inherit pkgs-stable;
+                        };
+                    }
+                ];
                 specialArgs = {
                     inherit pkgs-stable;
                     inherit nixvim;
                 };
             };
         };
-        homeConfigurations = {
-            poggers = home-manager.lib.homeManagerConfiguration {
-                inherit pkgs;
-                inherit nixvim;
-                modules = [ ./modules/home.nix ]; 
-            };
-        };
     };
 }