diff --git a/desktop.nix b/desktop.nix
index 79b696f..3b008d1 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, unstable, ... }: {
   ## Boot, drivers, and host name
   # Use grub
   boot.loader = {
@@ -44,6 +44,6 @@
   };
   ## Left over uncategorized packages
   environment.systemPackages = with pkgs; [
-    firefox-wayland
+    firefox unstable.firefox-beta-bin
   ];
 }
diff --git a/flake.lock b/flake.lock
index b0d1d6f..f0c44c9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "emacs": {
       "locked": {
-        "lastModified": 1642761284,
-        "narHash": "sha256-kGmyiBd3F4qmQyz4UjolCyFA1bo+w5ix+IDAhjjkMc0=",
+        "lastModified": 1643222610,
+        "narHash": "sha256-EnR5nypyGCRgRcox2bhiMcWWFv/DviJEcfDJCJBaghc=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "0cee2f8b2e0f21ec1e120ffed9fb9de195f332ca",
+        "rev": "e4f09393c327bf56be25476ccd0f7628637445bb",
         "type": "github"
       },
       "original": {
@@ -17,17 +17,15 @@
     },
     "fenix": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ],
+        "nixpkgs": "nixpkgs",
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1642746228,
-        "narHash": "sha256-H17bCeS39UVsUxn3qq/zZ3WuxsJPsTgh5YK+rpgg/ug=",
+        "lastModified": 1643178253,
+        "narHash": "sha256-8E2Gv9d8iZWChZ1EdXeDkNrXTJCn5vvBKVvocZTdoC0=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "55acc3d46535c2732d96dd439aa76a9ad3f0f0d2",
+        "rev": "d81537d2ea5cd1e9866f8e58a7b756a4b2a5070c",
         "type": "github"
       },
       "original": {
@@ -36,29 +34,45 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "mozilla": {
+      "flake": false,
       "locked": {
-        "lastModified": 1642707142,
-        "narHash": "sha256-BzH6xhnkn52yF4+A8C8slWFQRMInS5VYlzrH/rN1bnA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "6f07605b6916abee5435ea1145a7541299a87c1b",
+        "lastModified": 1638887313,
+        "narHash": "sha256-FMYV6rVtvSIfthgC1sK1xugh3y7muoQcvduMdriz4ag=",
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "rev": "7c1e8b1dd6ed0043fb4ee0b12b815256b0b9de6f",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1643080866,
+        "narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1642635915,
-        "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=",
+        "lastModified": 1643080866,
+        "narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f",
+        "rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d",
         "type": "github"
       },
       "original": {
@@ -68,22 +82,39 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1643148353,
+        "narHash": "sha256-VMX2quZAFjCoAFzQX23ALsLNA7Y6d6qSNIvz1ySj2iY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b3d86c56c786ad9530f1400adbd4dfac3c42877b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-21.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "emacs": "emacs",
         "fenix": "fenix",
-        "nixpkgs": "nixpkgs",
+        "mozilla": "mozilla",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1642622501,
-        "narHash": "sha256-FUd86eWQuu2k4S9hA1/6km4dfGtWs0TgT8AkT1oNjTs=",
+        "lastModified": 1643126615,
+        "narHash": "sha256-H1CZ9b0GckNeRNxwzuRZUVKmb6TF1q44wfyQlmuQlEY=",
         "owner": "rust-analyzer",
         "repo": "rust-analyzer",
-        "rev": "df5340386365b2b16c4e9bbae546504b97564c41",
+        "rev": "2cb85c14b622002767c66881c6a316a94e0f0be4",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a505f7c..9312a6b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,15 +6,17 @@
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     fenix = {
       url = "github:nix-community/fenix";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
     emacs = {
       url = "github:nix-community/emacs-overlay";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+    mozilla = {
+      url = "github:mozilla/nixpkgs-mozilla";
+      flake = false;
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, fenix, emacs }:
+  outputs = { self, nixpkgs, nixpkgs-unstable, fenix, emacs, mozilla }:
     let
       coreModules = [
         ./modules/user.nix
@@ -39,6 +41,7 @@
         ./applications/syncthing.nix
         ./desktop.nix
       ];
+      mozillaOverlay = import "${mozilla}";
     in
     {
       nixosConfigurations.levitation = nixpkgs.lib.nixosSystem {
@@ -46,7 +49,7 @@
         specialArgs = {
           unstable = import nixpkgs-unstable {
             config = { allowUnfree = true; };
-            overlays = [ emacs.overlay ];
+            overlays = [ emacs.overlay mozillaOverlay ];
             system = "x86_64-linux";
           };
           fenix = fenix.packages.x86_64-linux;
diff --git a/modules/sway.nix b/modules/sway.nix
index d77467e..e26bf8c 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -70,6 +70,9 @@
       export QT_QPA_PLATFORMTHEME="qt5ct"
       # Make pipewire present a pulse audio tcp port
       pactl load-module module-native-protocol-tcp
+      # Make firefox use wayland
+      export MOZ_ENABLE_WAYLAND=1
+      export XDG_CURRENT_DESKTOP="sway"
     '';
   };