diff --git a/system/config.nix b/system/config.nix
index 7092ef6813c..dad42cbad0e 100644
--- a/system/config.nix
+++ b/system/config.nix
@@ -20,6 +20,7 @@ rec {
       decl =
         lib.findSingle (decl: lib.eqLists decl.name name)
           (abort ("Undeclared option `" + printName name + "'."))
+          (abort ("Multiple declarations for option `" + printName name + "'."))
           declarations;
       default =
         if !decl ? default
diff --git a/system/options.nix b/system/options.nix
index 2ec872db51c..2ee61a00de0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -720,14 +720,6 @@
 	";
   }  
 
-  {
-	name = ["services" "xserver" "layout"];
-	default = "us";
-	description ="
-	Keyboard layout.
-	";
-  }  
-
   {
 	name = ["services" "xserver" "useInternalAGPGART"];
 	default = "";