diff --git a/lib/flake-utils.nix b/lib/flake-utils.nix
index b2741d53..82a4cc06 100644
--- a/lib/flake-utils.nix
+++ b/lib/flake-utils.nix
@@ -68,18 +68,12 @@ in rec {
        => { ... } # A home-manager configuration set.
   */
   mkUser = file:
-    attrs@{ username ? (builtins.baseNameOf file), system ? sys
-    , extraModules ? [ ], extraSpecialArgs ? { inherit lib system; }, ... }:
-    let
-      hmConfigFunctionArgs = builtins.attrNames (builtins.functionArgs
-        inputs.home-manager.lib.homeManagerConfiguration);
-      hmModules = lib.map (path: import path)
-        (lib.modulesToList (lib.filesToAttrRec ../modules/home-manager));
-    in inputs.home-manager.lib.homeManagerConfiguration {
+    { username ? (builtins.baseNameOf file), system ? sys
+    , extraModules ? [ ], extraSpecialArgs ? { inherit lib system; } }:
+    inputs.home-manager.lib.homeManagerConfiguration {
       inherit system username extraSpecialArgs;
       configuration = import file;
       homeDirectory = "/home/${username}";
-      extraModules = hmModules ++ extraModules
-        ++ [ (lib.filterAttrs (n: _: !lib.elem n hmConfigFunctionArgs) attrs) ];
+      extraModules = (lib.modulesToList (lib.filesToAttr ../modules/home-manager)) ++ extraModules;
     };
 }