diff --git a/hosts/sydpc/configuration.nix b/hosts/sydpc/configuration.nix
index c43a11d..93a8eea 100644
--- a/hosts/sydpc/configuration.nix
+++ b/hosts/sydpc/configuration.nix
@@ -121,17 +121,12 @@
     pkgs.cachix
   ];
 
-  programs.xwayland.enable = true;
-
   services.openssh = {
     enable = true;
     settings.PermitRootLogin = "yes";
     settings.X11Forwarding = true;
   };
 
-  # TODO: Move to defaults.
-  users.mutableUsers = false;
-
   nix = {
     settings = {
       allow-import-from-derivation = true;
diff --git a/modules/nixos/users.nix b/modules/nixos/users.nix
index 466a0ef..fdd2118 100644
--- a/modules/nixos/users.nix
+++ b/modules/nixos/users.nix
@@ -1,18 +1,18 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
   cfg = config.sydnix.users;
 in {
-  options = {
-    sydnix.users = {
-      users = mkOption {
-        description =
-          "List of usernames whose home profiles should be imported.";
-        type = with types; listOf str;
-        default = [];
-      };
+  options.sydnix.users = {
+    users = lib.mkOption {
+      description =
+        "List of usernames whose home profiles should be imported.";
+      type = with lib.types; listOf str;
+      default = [];
     };
   };
+
+  config = {
+    users.mutableUsers = false;
+  };
 }