diff --git a/nixos/machines/nyarlathotep/hardware-configuration.nix b/nixos/machines/nyarlathotep/hardware-configuration.nix
index f9bd476..9f0307e 100644
--- a/nixos/machines/nyarlathotep/hardware-configuration.nix
+++ b/nixos/machines/nyarlathotep/hardware-configuration.nix
@@ -4,17 +4,16 @@
   fileSystems."/" = {
     device = "nya-root";
     fsType = "tmpfs";
-    options = [ "size=1G" "mode=755" ];
   };
   fileSystems."/persist" = {
     device = "/dev/disk/by-uuid/a72da670-f631-49b1-bcb3-6d378cc1f2d0";
     fsType = "btrfs";
     options = [ "subvol=persist" ];
-    neededForBoot = true;
   };
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/75b01f48-e159-4d72-b049-54b7af072076";
-    fsType = "ext4";
+    device = "/dev/disk/by-uuid/a72da670-f631-49b1-bcb3-6d378cc1f2d0";
+    fsType = "btrfs";
+    options = [ "subvol=boot" ];
   };
   fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/a72da670-f631-49b1-bcb3-6d378cc1f2d0";
diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix
index 874016a..d540660 100644
--- a/nixos/roles/default.nix
+++ b/nixos/roles/default.nix
@@ -24,7 +24,6 @@ networking = {
 
 users = {
   mutableUsers = false;
-  users.root.hashedPassword = "!";
 };
 
 impermanence.enable = true;