diff --git a/nix/os/devices/steveej-x13s-rmvbl/configuration.nix b/nix/os/devices/steveej-x13s-rmvbl/configuration.nix
index cfbf501..fd8e1c1 100644
--- a/nix/os/devices/steveej-x13s-rmvbl/configuration.nix
+++ b/nix/os/devices/steveej-x13s-rmvbl/configuration.nix
@@ -11,12 +11,8 @@
 
 {
   imports = [
-    {
-      users.commonUsers = {
-        enable = true;
-        enableNonRoot = true;
-        installPassword = "install";
-      };
-    }
+    ../steveej-x13s/configuration.nix
   ];
+
+  users.commonUsers.installPassword = "install";
 }
diff --git a/nix/os/devices/steveej-x13s-rmvbl/default.nix b/nix/os/devices/steveej-x13s-rmvbl/default.nix
index 0ccb5dc..e7a5794 100644
--- a/nix/os/devices/steveej-x13s-rmvbl/default.nix
+++ b/nix/os/devices/steveej-x13s-rmvbl/default.nix
@@ -20,17 +20,12 @@
       };
 
   ${nodeName} = {
-
     deployment.targetHost = "${nodeName}.${localDomainName}";
     deployment.replaceUnknownProfiles = true;
     deployment.allowLocalDeployment = true;
 
-    # nixpkgs.pkgs = nodeFlake.inputs.nixpkgs.legacyPackages.${system};
-
     imports = [
       (repoFlake + "/nix/os/devices/${nodeName}/configuration.nix")
-
-      nodeFlake.inputs.home-manager.nixosModules.home-manager
     ];
 
     networking.hostName = nodeName;
diff --git a/nix/os/devices/steveej-x13s/default.nix b/nix/os/devices/steveej-x13s/default.nix
index 545dde3..fc3933e 100644
--- a/nix/os/devices/steveej-x13s/default.nix
+++ b/nix/os/devices/steveej-x13s/default.nix
@@ -22,7 +22,6 @@
       };
 
   ${nodeName} = {
-
     deployment.targetHost = "${nodeName}.${localDomainName}";
     deployment.replaceUnknownProfiles = true;
     deployment.allowLocalDeployment = true;
@@ -32,7 +31,5 @@
     imports = [
       (repoFlake + "/nix/os/devices/${nodeName}/configuration.nix")
     ];
-
-    networking.hostName = nodeName;
   };
 }
diff --git a/nix/os/devices/steveej-x13s/disko.nix b/nix/os/devices/steveej-x13s/disko.nix
index 5abf297..39eb9e1 100644
--- a/nix/os/devices/steveej-x13s/disko.nix
+++ b/nix/os/devices/steveej-x13s/disko.nix
@@ -23,7 +23,7 @@
               size = "100%";
               content = {
                 type = "luks";
-                name = "x13s-usb-crypt";
+                name = "x13s-nvme-crypt";
                 extraOpenArgs = [ ];
                 # disable settings.keyFile if you want to use interactive password entry
                 #passwordFile = "/tmp/secret.key"; # Interactive