diff --git a/flake.nix b/flake.nix
index c53a1a17..50898a55 100644
--- a/flake.nix
+++ b/flake.nix
@@ -380,9 +380,8 @@
         lib'.mapAttrs
           (filename: metadata:
             let
-              name = metadata._name;
-              system = metadata._system;
-              pkgs = inputs.${metadata.nixpkgs-channel or "nixpkgs"}.legacyPackages.${system};
+              name = metadata.username or filename;
+              pkgs = import nixpkgs { inherit overlays; };
               path = ./users/home-manager/${name};
               extraModules = [
                 ({ pkgs, config, ... }: {
@@ -417,7 +416,7 @@
               ];
             in
             mkHome {
-              inherit pkgs system extraModules extraArgs;
+              inherit pkgs extraModules extraArgs;
               home-manager-channel = metadata.home-manager-channel or "home-manager";
             })
           users;
diff --git a/lib/images.nix b/lib/images.nix
index 70f5bff0..b7d05e9e 100644
--- a/lib/images.nix
+++ b/lib/images.nix
@@ -13,7 +13,7 @@
     };
 
   # A wrapper around the home-manager configuration function.
-  mkHome = { pkgs, system, extraModules ? [ ], extraArgs ? { }, home-manager-channel ? "home-manager" }:
+  mkHome = { pkgs, extraModules ? [ ], extraArgs ? { }, home-manager-channel ? "home-manager" }:
     inputs."${home-manager-channel}".lib.homeManagerConfiguration {
       inherit lib pkgs;
       extraSpecialArgs = extraArgs;