diff --git a/hosts/default.nix b/hosts/default.nix
index bf2cdd3..334be65 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -27,6 +27,7 @@ let
       inherit system;
       specialArgs = {
         inherit nixpkgs top overlays;
+        inherit (top) self;
       };
       modules = [
         {
diff --git a/modules/baseline.nix b/modules/baseline.nix
index 2adc765..c41cef6 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -2,10 +2,13 @@
   pkgs,
   config,
   lib,
+  self,
   ...
 }:
 let
-  builderHosts = [ "jude" "myself" ];
+  builderHosts = (
+    lib.attrNames (lib.filterAttrs (_: v: v.config.greg.remote-builder.enable) self.nixosConfigurations)
+  );
 in
 {
   # Enable flakes