diff --git a/flake.nix b/flake.nix
index 35a1c742..4066b446 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,24 +32,6 @@
     };
     lib = nixpkgs.lib;
   in {
-    # Set up users with home-manager
-    homeManagerConfigurations = {
-      # Configuration for user "Albert"
-      albert = home-manager.lib.homeManagerConfiguration {
-        inherit system pkgs;
-        username = "albert";
-        homeDirectory = "/home/albert";
-        configuration.imports = [ ./users/albert/home.nix ];
-      };
-      # Configuration for user "root"
-      root = home-manager.lib.homeManagerConfiguration {
-        inherit system pkgs;
-        username = "root";
-        homeDirectory = "/root";
-        configuration.imports = [ ./users/root/home.nix ];
-      };
-    };
-
     # NixOS Configuration files:
     nixosConfigurations = {
       # Declare a generic configuration using the $hostname variable:
@@ -72,6 +54,8 @@
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
+            home-manager.users.albert = import ./users/albert/home.nix;
+            home-manager.users.root = import ./users/root/home.nix;
           }
         ]; # modules
       }; # lib.nixosSystem - nixos-laptop