diff --git a/hosts/builder/default.nix b/hosts/builder/default.nix
index 1a7258b..c4c55c1 100644
--- a/hosts/builder/default.nix
+++ b/hosts/builder/default.nix
@@ -5,23 +5,26 @@
   pwd,
   config,
   inputs,
+  outputs,
   ...
 }: {
-  imports = [
-    inputs.disko.nixosModules.disko
+  imports =
+    [
+      inputs.disko.nixosModules.disko
 
-    ./disko.nix
-    ./hardware-configuration.nix
+      ./disko.nix
+      ./hardware-configuration.nix
 
-    "${pwd}/features-nixos/global/fish.nix" # fish for admin
-    "${pwd}/features-nixos/global/locale.nix"
-    "${pwd}/features-nixos/global/nix.nix"
-    "${pwd}/features-nixos/global/sops.nix"
-    "${pwd}/features-nixos/global/root.nix"
+      "${pwd}/features-nixos/global/fish.nix" # fish for admin
+      "${pwd}/features-nixos/global/locale.nix"
+      "${pwd}/features-nixos/global/nix.nix"
+      "${pwd}/features-nixos/global/sops.nix"
+      "${pwd}/features-nixos/global/root.nix"
 
-    # "${pwd}/features-nixos/optional/hydra.nix"
-    # "${pwd}/features-nixos/optional/jenkins-agent.nix"
-  ];
+      # "${pwd}/features-nixos/optional/hydra.nix"
+      # "${pwd}/features-nixos/optional/jenkins-agent.nix"
+    ]
+    ++ (builtins.attrValues outputs.nixosModules);
 
   frajul.gitlab-runner = {
     enable = false;