diff --git a/flake.nix b/flake.nix
index e8948cad..c84465d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,7 +43,7 @@
       extraHostRegistry = import ./host-registry.nix;
       hostRegistry = nixpkgs.lib.recursiveUpdate zwHostRegistry extraHostRegistry;
 
-      flakifiedHosts = nixpkgs.lib.filterAttrs (_: { system ? null, ... }: system != null) hostRegistry.hosts;
+      flakifiedHosts = nixpkgs.lib.filterAttrs (name: _: self.nixosConfigurations ? ${name}) hostRegistry.hosts;
 
       getHostAddr = name:
         let
@@ -148,7 +148,6 @@
           # Our custom NixOS builder
           { extraArgs ? {}, ... }@args:
           nixpkgs.lib.nixosSystem (args // {
-            #system = hostRegistry.${
             extraArgs = extraArgs // {
               inherit hostRegistry;
             };
diff --git a/host-registry.nix b/host-registry.nix
index fed2449a..2d417f5d 100644
--- a/host-registry.nix
+++ b/host-registry.nix
@@ -9,7 +9,6 @@ rec {
       ether = "ec:a8:6b:fe:b4:cb";
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAnEWn/8CKIiCtehh6Ha3XUQqjODj0ygyo3aGAsFWgfG";
-      system = "x86_64-linux";
       wol = true;
     };
 
@@ -21,7 +20,6 @@ rec {
       ether = "dc:a6:32:31:b6:32";
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9RKlt+mIew5epxHt7Gab44yFOdeD+L/EhhA6Ospzyq";
-      system = "aarch64-linux";
       builders = [ "ssh://client@172.22.99.110" ];
       wol = true;
     };
@@ -71,63 +69,53 @@ rec {
       ygg = "201:4561:bb58:4dac:5f6a:7b23:44f:a5ef";
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHDmEymILp4IACjCbtMXx6eKPuTZHKyPUfAev05Gn7hi";
-      system = "x86_64-linux";
     };
     freifunk = {
       ip4 = "172.20.72.40";
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMFbxHGfBMBjjior1FNRub56O62K++HVnqUH67BeKD7d";
-      system = "x86_64-linux";
     };
     matemat = {
       ip4 = "172.22.99.133";
       ip6 = "2a00:8180:2c00:223:f82b:1bff:fedc:8572";
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBa07c4NnU1TGX1SMNea9e1d4nMtc0OS4gJLmTA3g/fe";
-      system = "x86_64-linux";
     };
     scrape = {
       ip4 = "172.20.73.32";
       ip6 = "2a00:8180:2c00:282:e073:50ff:fef5:eb6e";
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEGxPgg6nswoij1fBzDPDu6h4+d458XL2+dBxAx9KVOh";
-      system = "x86_64-linux";
     };
 
     dn42 = {
       ip4 = "172.22.99.253";
-      system = "x86_64-linux";
     };
 
     grafana = {
       ip6 = "2a00:8180:2c00:282:4042:fbff:fe4b:2de8";
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPFB9fo01jzr2upEBEXiR7sSmeQoq9ll5Cf5/hjq5e4Y";
-      system = "x86_64-linux";
     };
 
     hydra = {
       ip4 = "172.20.73.49";
       ip6 = "2a00:8180:2c00:282:e03c:d7ff:fe8e:fe16";
-      system = "x86_64-linux";
     };
 
     mucbot = {
       ip4 = "172.20.73.27";
       ip6 = "2a00:8180:2c00:282:28db:dff:fe6b:e89a";
-      system = "x86_64-linux";
     };
 
     kibana = {
       ip4 = "172.20.73.44";
       ip6 = "2a00:8180:2c00:282:460:7cff:fe28:76b2";
-      system = "x86_64-linux";
     };
 
     public-access-proxy = {
       ip4 = "172.20.73.45";
       ip6 = "2a00:8180:2c00:282:1024:5fff:febd:9be7";
-      system = "x86_64-linux";
     };
   };