diff --git a/flake.nix b/flake.nix
index 43872a9d..d980910f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,7 +76,7 @@
           nixpkgs.lib.nixosSystem {
             modules = [
               ./hosts/${host}
-              { nixpkgs.hostPlatform = import ./hosts/${host}/system.nix; }
+              { nixpkgs.hostPlatform = (myUtils.hostMeta ./hosts/${host}).system; }
             ];
             specialArgs = {
               inherit
diff --git a/hosts/andromache/meta.nix b/hosts/andromache/meta.nix
index 0139f261..a913e4b6 100644
--- a/hosts/andromache/meta.nix
+++ b/hosts/andromache/meta.nix
@@ -1,4 +1,5 @@
 {
+  system = "x86_64-linux";
   deployment.tags = [ "local" ];
   role = "desktop";
 }
diff --git a/hosts/andromache/system.nix b/hosts/andromache/system.nix
deleted file mode 100644
index 132026a6..00000000
--- a/hosts/andromache/system.nix
+++ /dev/null
@@ -1 +0,0 @@
-"x86_64-linux"
diff --git a/hosts/astyanax/meta.nix b/hosts/astyanax/meta.nix
index d0c4fccc..c818983b 100644
--- a/hosts/astyanax/meta.nix
+++ b/hosts/astyanax/meta.nix
@@ -1,4 +1,5 @@
 {
+  system = "x86_64-linux";
   deployment.tags = [ "local" ];
   role = "laptop";
 }
diff --git a/hosts/astyanax/system.nix b/hosts/astyanax/system.nix
deleted file mode 100644
index 132026a6..00000000
--- a/hosts/astyanax/system.nix
+++ /dev/null
@@ -1 +0,0 @@
-"x86_64-linux"
diff --git a/hosts/eetion-02/meta.nix b/hosts/eetion-02/meta.nix
index c064d2fe..3fee3acf 100644
--- a/hosts/eetion-02/meta.nix
+++ b/hosts/eetion-02/meta.nix
@@ -1,4 +1,5 @@
 {
+  system = "aarch64-linux";
   deployment.tags = [ "arm" ];
   role = "embedded";
 }
diff --git a/hosts/eetion-02/system.nix b/hosts/eetion-02/system.nix
deleted file mode 100644
index 9487bccc..00000000
--- a/hosts/eetion-02/system.nix
+++ /dev/null
@@ -1 +0,0 @@
-"aarch64-linux"
diff --git a/hosts/eetion/meta.nix b/hosts/eetion/meta.nix
index c064d2fe..3fee3acf 100644
--- a/hosts/eetion/meta.nix
+++ b/hosts/eetion/meta.nix
@@ -1,4 +1,5 @@
 {
+  system = "aarch64-linux";
   deployment.tags = [ "arm" ];
   role = "embedded";
 }
diff --git a/hosts/eetion/system.nix b/hosts/eetion/system.nix
deleted file mode 100644
index 9487bccc..00000000
--- a/hosts/eetion/system.nix
+++ /dev/null
@@ -1 +0,0 @@
-"aarch64-linux"
diff --git a/hosts/hecuba/meta.nix b/hosts/hecuba/meta.nix
index d11d1cfa..b737ba67 100644
--- a/hosts/hecuba/meta.nix
+++ b/hosts/hecuba/meta.nix
@@ -1,4 +1,5 @@
 {
+  system = "x86_64-linux";
   deployment.tags = [ "cloud" ];
   role = "server";
 }
diff --git a/hosts/hecuba/system.nix b/hosts/hecuba/system.nix
deleted file mode 100644
index 132026a6..00000000
--- a/hosts/hecuba/system.nix
+++ /dev/null
@@ -1 +0,0 @@
-"x86_64-linux"
diff --git a/hosts/vm/meta.nix b/hosts/vm/meta.nix
index 9123f0d7..7fde780f 100644
--- a/hosts/vm/meta.nix
+++ b/hosts/vm/meta.nix
@@ -1,4 +1,5 @@
 {
+  system = "x86_64-linux";
   deployment.tags = [ "local" ];
   role = "vm";
 }
diff --git a/hosts/vm/system.nix b/hosts/vm/system.nix
deleted file mode 100644
index 132026a6..00000000
--- a/hosts/vm/system.nix
+++ /dev/null
@@ -1 +0,0 @@
-"x86_64-linux"