diff --git a/common/common.nix b/common/common.nix
index 14eaf65c..46ee662a 100644
--- a/common/common.nix
+++ b/common/common.nix
@@ -20,15 +20,17 @@
               "TJHVUM6-RTB6V3D-JF4GIB2-TVDF2ST-5MTN6N2-ZDIWGF7-XZUCCFG-EQG5WA6";
           };
       in {
-        devices = pkgs.lib.getAttrs hosts devices;
-        folders = {
-          science = mkFolder "science";
-          documents = mkFolder "documents";
-          audio = mkFolder "audio";
-          video = mkFolder "video";
-          images = mkFolder "images";
-          books = mkFolder "books";
-          tmp = mkFolder "tmp";
+        settings = {
+          devices = pkgs.lib.getAttrs hosts devices;
+          folders = {
+            science = mkFolder "science";
+            documents = mkFolder "documents";
+            audio = mkFolder "audio";
+            video = mkFolder "video";
+            images = mkFolder "images";
+            books = mkFolder "books";
+            tmp = mkFolder "tmp";
+          };
         };
       };
   };
diff --git a/nixos/machines/apollo/hardware-configuration.nix b/nixos/machines/apollo/hardware-configuration.nix
index 74bdab00..ce91c58a 100644
--- a/nixos/machines/apollo/hardware-configuration.nix
+++ b/nixos/machines/apollo/hardware-configuration.nix
@@ -8,7 +8,6 @@
       };
       grub = {
         enable = true;
-        version = 2;
         device = "nodev";
         efiSupport = true;
         enableCryptodisk = true;
diff --git a/nixos/machines/hera/boot.nix b/nixos/machines/hera/boot.nix
index 70e7ab19..4b0d2d80 100644
--- a/nixos/machines/hera/boot.nix
+++ b/nixos/machines/hera/boot.nix
@@ -4,7 +4,6 @@
   boot = {
     loader.grub = {
       enable = true;
-      version = 2;
       device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
     };
     supportedFilesystems = [ "exfat" ];