diff --git a/systems/x86_64-linux/mow0m/hardware.nix b/systems/x86_64-linux/mow0m/hardware.nix
index 46a27e9..afe072e 100644
--- a/systems/x86_64-linux/mow0m/hardware.nix
+++ b/systems/x86_64-linux/mow0m/hardware.nix
@@ -8,36 +8,34 @@
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelParams = [ "elevator=noop" "boot.shell_on_fail" "ip=dhcp" ];
   boot.extraModulePackages = [ ];
   boot.supportedFilesystems = [ "zfs" ];
   networking.hostId = "c61a0c21";
   networking.useDHCP = lib.mkDefault true;
 
-  # Grub boot loader
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.efi.efiSysMountPoint = "/boot";
-  boot.loader.grub.enable = true;
-  boot.loader.grub.copyKernels = true;
-  boot.loader.grub.efiSupport = true;
-  boot.loader.grub.device = "nodev";
-  #boot.loader.grub.devices = [
-  #  "/dev/disk/by-uuid/90A1-2F0B"
-  #  "/dev/disk/by-uuid/90F1-EAEB"
-  #];
-  boot.loader.grub.mirroredBoots = [
-    {
-      devices = [ "/dev/disk/by-uuid/90A1-2F0B" ];
-      path = "/boot";
-    }
-    {
-      devices = [ "/dev/disk/by-uuid/90F1-EAEB" ];
-      path = "/boot-fallback";
-    }
-    # The first Boot Device is Mounted on /boot and gets added Automatically
-  ];
+  # Bootloader
+  boot.loader = {
+    efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot"; # use the same mount point here.
+    };
+    grub = {
+      enable = true;
+      version = 2;
+      copyKernels = true;
+      efiSupport = true;
+      mirroredBoots = [
+        {devices = [ "/dev/nvme0n1" ]; path = "/boot";}
+        {devices = [ "/dev/nvme1n1" ]; path = "/boot1";}
+      ];
+    };
+  };
+  # Uncomment [on a working system] to ensure extra safeguards are active that zfs uses to protect zfs pools:
+  #boot.zfs.forceImportAll = false;
+  #boot.zfs.forceImportRoot = false;
 
   # Remote Filesystem(s) unlocking
-  boot.kernelParams = [ "ip=dhcp" ];
   boot.initrd.network.enable = true;
   boot.initrd.network.ssh = {
     enable = true;
@@ -53,13 +51,13 @@
     '';
 
   # Filesystems
-  fileSystems."/boot" = { 
-    device = "/dev/disk/by-uuid/90A1-2F0B";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/7C96-7E8A";
     fsType = "vfat";
     options = [ "fmask=0022" "dmask=0022" ];
   };
-  fileSystems."/boot-fallback" = {
-    device = "/dev/disk/by-uuid/90F1-EAEB";
+  fileSystems."/boot1" = {
+    device = "/dev/disk/by-uuid/7C97-3483";
     fsType = "vfat";
     options = [ "fmask=0022" "dmask=0022" ];
   };