diff --git a/base.nix b/base.nix
index 71cf73d..ddd33e0 100644
--- a/base.nix
+++ b/base.nix
@@ -95,8 +95,10 @@
 
 # Select internationalisation properties.
 		i18n.defaultLocale = "en_US.UTF-8";
-	services.xserver.layout = "us,";
-	services.xserver.xkbVariant = "de_se_fi,";
+	services.xserver.xkb = { 
+		layout = "us,";
+		variant = "de_se_fi,";
+	};
 	console = pkgs.lib.mkForce {
 		font = "Lat2-Terminus16";
 		useXkbConfig = true; # use xkbOptions in tty.
diff --git a/desktop.nix b/desktop.nix
index 51b9454..715f835 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -486,13 +486,15 @@ in
 	];
 
 	services = {
+		displayManager = {
+			defaultSession = "none+i3";
+			autoLogin.enable = true;
+			autoLogin.user = "vili";
+		};
 		xserver = {
 			enable = true;
 			displayManager = {
-				defaultSession = "none+i3";
 				lightdm.enable = true;
-				autoLogin.enable = true;
-				autoLogin.user = "vili";
 				sessionCommands = ''${pkgs.xorg.xrdb}/bin/xrdb -merge < ${Xresources}'';
 			};
 			windowManager.i3 = {
@@ -504,7 +506,7 @@ in
 		printing.enable = true;
 		avahi = {
 			enable = true;
-			nssmdns = true;
+			nssmdns4 = true;
 			openFirewall = true;
 		};
 	};
diff --git a/machine-confs/helium.nix b/machine-confs/helium.nix
index eff7118..1ac02e3 100644
--- a/machine-confs/helium.nix
+++ b/machine-confs/helium.nix
@@ -75,7 +75,7 @@ in
 			../development.nix
 			../misc/libinput.nix
 	];
-	disabledModules = [ "services/x11/hardware/libinput.nix" ];
+	disabledModules = [ "services/hardware/libinput.nix" ];
 
 	nixpkgs.overlays = 
 		[