diff --git a/modules/programs/firefox/default.nix b/modules/programs/firefox/default.nix
index 72b5c54..3500f72 100644
--- a/modules/programs/firefox/default.nix
+++ b/modules/programs/firefox/default.nix
@@ -3,13 +3,12 @@
 {
   config = {
     environment = {
-      systemPackages = with pkgs; [ firefox-wayland tor-browser-bundle-bin ];
+      systemPackages = with pkgs; [ unstable.firefox-wayland tor-browser-bundle-bin ];
 
       # Deploy a Firefox policy to set the search engine and do some other things
       etc."firefox/policies/policies.json".source = ./policies.json;
 
-      variables = {
-        # TODO: Use pam_environment once I figure out how to enable it.
+      sessionVariables = {
         # Enable multi-touch...
         "MOZ_USE_XINPUT2" = "1";
         # ... and Wayland