diff --git a/flake.nix b/flake.nix
index 92658df..6eef631 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,6 @@
           [
             {
               hostname = "snowhawk";
-              system = "x86_64-linux";
             }
           ];
 
@@ -34,12 +33,10 @@
             {
               user = "zynh";
               hostname = "msiserver";
-              system = "x86_64-linux";
             }
             {
               user = "val";
               hostname = "caveserver";
-              system = "x86_64-linux";
             }
             {
               user = "zynh";
diff --git a/lib/builders.nix b/lib/builders.nix
index 2d16abf..fd44bb9 100644
--- a/lib/builders.nix
+++ b/lib/builders.nix
@@ -17,7 +17,7 @@ let
 in
 rec {
   toPartialNixosConfig =
-    { hostname, system }:
+    { hostname, system ? "x86_64-linux" }:
     nameValuePair
       hostname
       (nixosSystem rec {
@@ -44,7 +44,7 @@ rec {
       systems;
 
   toPartialHomeManagerConfig =
-    { user, system, hostname ? "", configHostname ? "" }:
+    { user, system ? "x86_64-linux", hostname ? "", configHostname ? "" }:
     let
       configHost = if builtins.stringLength configHostname > 0 then configHostname else hostname;
       hostStr = optionalString (builtins.stringLength hostname > 0) "@${hostname}";