diff --git a/lib/eval-outputs.nix b/lib/eval-outputs.nix
index d0f65d2..4501c5e 100644
--- a/lib/eval-outputs.nix
+++ b/lib/eval-outputs.nix
@@ -53,7 +53,7 @@ with rawInputs.nixpkgs.lib; let
 
     showWarnings = module:
       foldl (
-        module: warning: builtins.trace "warning: ${warning}" module
+        module: warning: builtins.trace "warning: ${warning}" module
       )
       module
       module.config.warnings;
@@ -85,13 +85,13 @@ with rawInputs.nixpkgs.lib; let
         extendModules = args: withExtraAttrs (config.extendModules args);
       };
   in
-    mapAttrs (_: config:
-      withExtraAttrs (config
-        // {
+    mapAttrs (_: configuration:
+      withExtraAttrs (configuration
+        // rec {
           class = "nixos";
-          options = config.options.os.type.getSubOptions [];
-          config = config.config.os;
-          inherit (evalModules {modules = config.options.os.type.getSubModules;}) extendModules;
+          options = builtins.removeAttrs (configuration.options.os.type.getSubOptions []) ["_module"];
+          config = configuration.config.os;
+          inherit (lib.evalModules {modules = [{inherit options config;}];}) extendModules;
         }))
     combinedManagerConfigurations;
 in