diff --git a/flake.nix b/flake.nix
index 7f3b793..98baa2a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,36 +57,9 @@
 
       kilgharrah.imports = [ ./hosts/kilgharrah ];
       tohru.imports = [ ./hosts/tohru ];
-
-      yevaud = { name, nodes, ... }: {
-        networking.hostId = "09673d65";
-        deployment.targetHost = "yevaud.birdsong.network";
-
-        imports = [
-          ./hosts/yevaud/configuration.nix
-        ];
-      };
-
-      orm = { name, nodes, ... }: {
-        networking.hostId = "00000000";
-        deployment.targetHost = "orm.birdsong.network";
-
-        imports = [
-          ./hosts/orm/configuration.nix
-        ];
-      };
-
-      kalessin = { name, nodes, ... }: {
-        networking.hostId = "534b538e";
-        deployment = {
-          targetHost = "kalessin.birdsong.network";
-          buildOnTarget = true;
-        };
-
-        imports = [
-          ./hosts/kalessin/configuration.nix
-        ];
-      };
+      yevaud.imports = [ ./hosts/yevaud ];
+      orm.imports = [ ./hosts/orm ];
+      kalessin.imports = [ ./hosts/kalessin ];
     };
 
     # TODO: have this work on other systems too
diff --git a/hosts/kalessin/configuration.nix b/hosts/kalessin/default.nix
similarity index 69%
rename from hosts/kalessin/configuration.nix
rename to hosts/kalessin/default.nix
index 3250f27..e3c08a6 100644
--- a/hosts/kalessin/configuration.nix
+++ b/hosts/kalessin/default.nix
@@ -5,6 +5,12 @@
     ./hardware-configuration.nix
   ];
 
+  networking.hostId = "534b538e";
+  deployment = {
+    targetHost = "kalessin.birdsong.network";
+    buildOnTarget = true;
+  };
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
diff --git a/hosts/orm/configuration.nix b/hosts/orm/default.nix
similarity index 84%
rename from hosts/orm/configuration.nix
rename to hosts/orm/default.nix
index c31dc6a..4b6e346 100644
--- a/hosts/orm/configuration.nix
+++ b/hosts/orm/default.nix
@@ -5,9 +5,12 @@
     ./hardware-configuration.nix
   ];
 
+  networking.hostId = "00000000";
+  deployment.targetHost = "orm.birdsong.network";
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  
+
   users.users.qenya.extraGroups = [ "wheel" ];
   qenya.base-server.enable = true;
 
diff --git a/hosts/yevaud/configuration.nix b/hosts/yevaud/default.nix
similarity index 92%
rename from hosts/yevaud/configuration.nix
rename to hosts/yevaud/default.nix
index 2fbd757..18f868a 100644
--- a/hosts/yevaud/configuration.nix
+++ b/hosts/yevaud/default.nix
@@ -5,6 +5,9 @@
     ./hardware-configuration.nix
   ];
 
+  networking.hostId = "09673d65";
+  deployment.targetHost = "yevaud.birdsong.network";
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;