diff --git a/lib.nix b/lib.nix
index 02e3846..e50dcbb 100644
--- a/lib.nix
+++ b/lib.nix
@@ -21,7 +21,14 @@ let
       globalOverlays
       ;
     moduleList = builtins.attrNames (builtins.readDir modulesFolder);
-    mergedModules = mergeModules ((map (fn: (import "${modulesFolder}/${fn}" { })) moduleList));
+    mergedModules = mergeModules (
+      builtins.listToAttrs (
+        map (fn: {
+          name = fn;
+          value = (import "${modulesFolder}/${fn}" { });
+        }) moduleList
+      )
+    );
 
     generateHostname =
       {