diff --git a/pkgs/nix-tools/darwin-rebuild.sh b/pkgs/nix-tools/darwin-rebuild.sh
index 3b4fb08f..cb250891 100644
--- a/pkgs/nix-tools/darwin-rebuild.sh
+++ b/pkgs/nix-tools/darwin-rebuild.sh
@@ -120,9 +120,9 @@ if [ -n "$flake" ]; then
        flakeAttr="${BASH_REMATCH[2]}"
     fi
     if [ -z "$flakeAttr" ]; then
-      flakeAttr=$(hostname)
+      flakeAttr=$(hostname -s)
     fi
-    flakeAttr=darwinConfigurations.${flakeAttr%.local}
+    flakeAttr=darwinConfigurations.${flakeAttr}
 fi
 
 if [ -n "$flake" ]; then