diff --git a/modules/nixos/samba.nix b/modules/nixos/samba.nix
index 8bae5d22..725dac23 100644
--- a/modules/nixos/samba.nix
+++ b/modules/nixos/samba.nix
@@ -211,7 +211,8 @@ in {
       type = nullOr path;
       default = null;
     };
-    settings = mkOption {
+    # TODO: move to upstream settings!
+    settings' = mkOption {
       type = attrsOf settingType;
       default = {};
     };
@@ -269,7 +270,7 @@ in {
           };
         })
       ];
-      settings = mkMerge ([
+      settings' = mkMerge ([
           {
             "use sendfile" = mkOptionDefault true;
             "mdns name" = mkOptionDefault "mdns";
@@ -326,7 +327,7 @@ in {
         ]
         ++ mapAttrsToList (_: idmap: mapAttrs' (key: value: nameValuePair "idmap config ${idmap.domain} : ${key}" (mkOptionDefault value)) idmap.settings) cfg.idmap.domains);
       extraConfig = mkMerge (
-        mapAttrsToList (key: value: ''${key} = ${settingValue value}'') cfg.settings
+        mapAttrsToList (key: value: ''${key} = ${settingValue value}'') cfg.settings'
         ++ [
           (mkIf (cfg.ldap.enable && cfg.ldap.passdb.enable) (mkBefore ''
             passdb backend = ${cfg.ldap.passdb.backend}:"${cfg.ldap.url}"
diff --git a/nixos/kyuuto/opl.nix b/nixos/kyuuto/opl.nix
index 413466d6..8bf98f78 100644
--- a/nixos/kyuuto/opl.nix
+++ b/nixos/kyuuto/opl.nix
@@ -35,7 +35,7 @@ in {
 
   config = {
     services.samba = {
-      settings = mkIf cfg.enable {
+      settings' = mkIf cfg.enable {
         "ntlm auth" = mkDefault "ntlmv1-permitted";
         "server min protocol" = mkDefault "NT1";
         "keepalive" = mkDefault 0;
diff --git a/nixos/samba.nix b/nixos/samba.nix
index edcb1d09..519e2cc4 100644
--- a/nixos/samba.nix
+++ b/nixos/samba.nix
@@ -61,7 +61,7 @@ in {
     passdb.smbpasswd.path = mkIf (!cfg.ldap.enable || !cfg.ldap.passdb.enable) (
       mkDefault config.sops.secrets.smbpasswd.path
     );
-    settings = mkMerge [
+    settings' = mkMerge [
       {
         "local master" = true;
         "preferred master" = true;