diff --git a/module.nix b/module.nix
index e8da3af..ce0310b 100644
--- a/module.nix
+++ b/module.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   nixpkgs.overlays = [ (import ./overlay.nix) ];
@@ -13,14 +13,14 @@
       [org.gnome.mutter]
       dynamic-workspaces=true
     '';
-    extraGSettingsOverridePackages = [ pkgs.gnome.mutter ];
+    extraGSettingsOverridePackages = [ pkgs.mutter ];
   };
 
   services.logind.powerKey = "ignore";
   services.logind.powerKeyLongPress = "poweroff";
 
   # Installed by default but not mobile friendly yet
-  environment.gnome.excludePackages = with pkgs; with gnome; [
+  environment.gnome.excludePackages = with pkgs; [
     totem # Videos
     simple-scan # Document Scanner
     gnome-system-monitor
@@ -33,10 +33,8 @@
   ];
 
   # Input method works, but these envvars must not be set, or the on-screen keyboard won't pop up.
-  # GNOME got a builtin IBus support through IBus' D-Bus API, so these variables are not neccessary.
-  environment.variables = {
-    GTK_IM_MODULE = lib.mkForce "";
-    QT_IM_MODULE = lib.mkForce "";
-    XMODIFIERS = lib.mkForce "";
-  };
+  # GNOME has a builtin IBus support through IBus' D-Bus API, so these variables are not neccessary.
+  environment.extraInit = ''
+    unset GTK_IM_MODULE QT_IM_MODULE XMODIFIERS
+  '';
 }
diff --git a/update.sh b/update.sh
index 888b676..e4bbf93 100755
--- a/update.sh
+++ b/update.sh
@@ -7,7 +7,7 @@ pushd "$tmpdir"
 new_version="unstable-$(git show -s --pretty='format:%cs')"
 commit_sha="$(git show -s --pretty='format:%H')"
 popd
-update-source-version "gnome.gnome-shell" --file=overlay.nix "$new_version" --rev="$commit_sha"
+update-source-version "gnome-shell" --file=overlay.nix "$new_version" --rev="$commit_sha"
 
 tmpdir="$(mktemp -d)"
 git clone --bare --depth=1 --branch=mobile-shell https://gitlab.gnome.org/verdre/mobile-mutter.git "$tmpdir"
@@ -15,4 +15,4 @@ pushd "$tmpdir"
 new_version="unstable-$(git show -s --pretty='format:%cs')"
 commit_sha="$(git show -s --pretty='format:%H')"
 popd
-update-source-version "gnome.mutter" --file=overlay.nix "$new_version" --rev="$commit_sha"
+update-source-version "mutter" --file=overlay.nix "$new_version" --rev="$commit_sha"