diff --git a/system/machines/server/system.nix b/system/machines/server/system.nix
index 5905c4d..1b64047 100644
--- a/system/machines/server/system.nix
+++ b/system/machines/server/system.nix
@@ -68,12 +68,14 @@
       enable = true;
       devices = [ "nodev" ];
       efiSupport = true;
+      efiInstallAsRemovable = true;  # HP Z230 UEFI ignores custom boot entries
       configurationLimit = 5;
       splashImage = null;
     };
 
     efi = {
-      canTouchEfiVariables = true;
+      canTouchEfiVariables = false;  # Not needed with efiInstallAsRemovable
+      efiSysMountPoint = "/boot";
     };
   };
 
@@ -82,6 +84,7 @@
     git
     vim
     htop
+    dmidecode
   ];
 
   security.sudo = {