diff --git a/nixos/hosts/framework-server/builder.nix b/nixos/hosts/framework-server/builder.nix
deleted file mode 100644
index 26d839c0..00000000
--- a/nixos/hosts/framework-server/builder.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ inputs, config, lib, pkgs, modulesPath, desktop, username, ... }: {
-  # For remote builds
-  # see home-manager: bash.nix:  rebuild-*-remote
-  # users.users.${username}.openssh.authorizedKeys.keyFiles = [ ../../../keys/ssh/builder-keys.txt ];
-
-  # For cross-architecture builds
-  boot.binfmt.emulatedSystems = [ 
-    "aarch64-linux" 
-    "armv7l-linux"
-  ];
-
-  environment.systemPackages = with pkgs; [ qemu_kvm ];
-}
\ No newline at end of file
diff --git a/nixos/hosts/framework-server/default.nix b/nixos/hosts/framework-server/default.nix
index 83b935a8..fa14ba95 100644
--- a/nixos/hosts/framework-server/default.nix
+++ b/nixos/hosts/framework-server/default.nix
@@ -4,13 +4,13 @@
     (modulesPath + "/installer/scan/not-detected.nix")
     ../../common/modules/secureboot.nix
     ../../common/modules/udev-rules.nix
+    ../../common/modules/builder.nix
     ../../common/services/fwupd.nix
     ../../common/modules/ssh-luks.nix
     ../../common/services/docker.nix
     ../../common/services/tailscale-autoconnect.nix
     ./containers.nix
     ./disks.nix
-    ./builder.nix
     ./wireguard.nix
     ./cron.nix
     ./firewall.nix
diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix
index 7bec4c77..afdd13f3 100644
--- a/nixos/hosts/nixos-framework/default.nix
+++ b/nixos/hosts/nixos-framework/default.nix
@@ -8,6 +8,7 @@
     ../../common/modules/secureboot.nix
     # ../../common/modules/boot.nix
     ../../common/modules/udev-rules.nix
+    ../../common/modules/builder.nix
     ../../common/services/podman.nix
   ];