diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index ea8d3c4185fe5f0168c013ddda41790fd9089241..5345a16198e79dd8c91c8566fb62480ce5cea51a 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -10,20 +10,20 @@ let
     monitoringvpnKeyDir = toString ./. + "/${rawConfig.monitoringvpnKeyDir}";
   };
 
-  payments = let publicIPv4 = "192.168.67.21"; in {
+  payments = {
     imports = [
       gridlib.issuer
-      (gridlib.hardware-virtual ({ inherit publicIPv4; }))
+      (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.21"; }))
       (gridlib.customize-issuer (config // {
           monitoringvpnIPv4 = "172.23.23.11";
       }))
     ];
   };
 
-  storage1 = let publicIPv4 = "192.168.67.22"; in {
+  storage1 = {
     imports = [
       gridlib.storage
-      (gridlib.hardware-virtual ({ inherit publicIPv4; }))
+      (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.22"; }))
       (gridlib.customize-storage (config // {
         monitoringvpnIPv4 = "172.23.23.12";
         stateVersion = "19.09";
@@ -31,10 +31,10 @@ let
     ];
   };
 
-  storage2 = let publicIPv4 = "192.168.67.23"; in {
+  storage2 = {
     imports = [
       gridlib.storage
-      (gridlib.hardware-virtual ({ inherit publicIPv4; }))
+      (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.23"; }))
       (gridlib.customize-storage (config // {
         monitoringvpnIPv4 = "172.23.23.13";
         stateVersion = "19.09";
@@ -42,10 +42,10 @@ let
     ];
   };
 
-  monitoring = let publicIPv4 = "192.168.67.24"; in {
+  monitoring = {
     imports = [
       gridlib.monitoring
-      (gridlib.hardware-virtual ({ inherit publicIPv4; }))
+      (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.24"; }))
       (gridlib.customize-monitoring {
         inherit hostsMap vpnClientIPs nodeExporterTargets;
         inherit (config) domain monitoringvpnKeyDir;