diff --git a/systems/mc6/configuration.nix b/systems/mc6/configuration.nix
index 84e9f5d..41ef0fa 100644
--- a/systems/mc6/configuration.nix
+++ b/systems/mc6/configuration.nix
@@ -2,10 +2,12 @@
   imports = [
     ./hardware-configuration.nix
     ./modules/generic.nix
+    ./modules/rclone.nix
+    ./modules/borg.nix
+    ./modules/postgresql.nix
+    ./modules/nextcloud.nix
   ];
 
-  networking.hostName = "mc6";
-  services.openssh.enable = true;
 }
 
 # vim: set et ts=2 sw=2 ai:
diff --git a/systems/mc6/hardware-configuration.nix b/systems/mc6/hardware-configuration.nix
index 5ed20e3..229b438 100644
--- a/systems/mc6/hardware-configuration.nix
+++ b/systems/mc6/hardware-configuration.nix
@@ -8,11 +8,16 @@
     [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" ];
+  system.stateVersion = "22.05";
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_blk" ];
+  boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
-  boot.loader.grub.device = "/dev/sda";
-  boot.initrd.kernelModules = [ "nvme" ];
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  boot.loader.grub.device = "/dev/vda";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   fileSystems."/" =
     { device = "/dev/disk/by-label/nixos";
@@ -20,11 +25,20 @@
       options = [ "compress-force=zstd" ];
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-label/boot";
+      fsType = "ext4";
+    };
+
   swapDevices = [ ];
 
+  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+  # Per-interface useDHCP will be mandatory in the future, so this generated config
+  # replicates the default behaviour.
   networking.useDHCP = lib.mkDefault false;
   networking.interfaces.ens3.useDHCP = lib.mkDefault true;
   networking.hostName = "mc6";
 
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
+
+# vim: set et ts=2 sw=2 ai: