diff --git a/flake.lock b/flake.lock
index a08c0d84..9538478b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1626081904,
-        "narHash": "sha256-0wn7dDt3bUIPrPhS7hXJ6uwGrJtDlIz9bJlxOt/oVJ8=",
+        "lastModified": 1626253792,
+        "narHash": "sha256-j6hICGf9h4U/CSk3ijEpoez9kQhNfE4TxOUNXkFdvrs=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "09ca15775275250fdfd6004465ed6fa342194b2b",
+        "rev": "f09b310259dded3d9c0ff4ff76a63999c055a2dd",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1626021213,
-        "narHash": "sha256-KDms4KJVXWV3ZUfHLA9Syi4Sz6kcMzNbpXx2cHy5HLs=",
+        "lastModified": 1626231738,
+        "narHash": "sha256-IMcTJymwj0TrvRpGiI5RMoMJN+8Qb5sG2LgrKEX25Cg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "635a1954044fb0dfbcfd857e3289ab12feb41530",
+        "rev": "53caacaf56640d04180775aee016d2f16d6f083c",
         "type": "github"
       },
       "original": {
diff --git a/modules/base/emacs/default.nix b/modules/base/emacs/default.nix
index 195bd825..8cc43db2 100644
--- a/modules/base/emacs/default.nix
+++ b/modules/base/emacs/default.nix
@@ -20,6 +20,16 @@
         alwaysEnsure = true;
         # mu4e is included in the mu package and should be used from there
         extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu;
+        override = epkgs: epkgs // {
+          modus-themes = epkgs.melpaPackages.modus-themes.overrideAttrs (old: {
+            src = pkgs.fetchFromGitLab {
+              owner = "protesilaos";
+              repo = "modus-themes";
+              rev = "6593dc2569722c3e85d9e00eff62e4afa35e0610";
+              hash = "sha256-druZQ2oBl0waMQbWcY3z9BkhURCtZGwp66cHbHnFRww=";
+            };
+          });
+        };
       };
     };
   };
diff --git a/modules/services/nextcloud/default.nix b/modules/services/nextcloud/default.nix
index a566cc41..ddfc5c85 100644
--- a/modules/services/nextcloud/default.nix
+++ b/modules/services/nextcloud/default.nix
@@ -13,7 +13,7 @@
         hostName = "nextcloud.vanpetegem.me";
         enable = true;
         autoUpdateApps.enable = true;
-        package = pkgs.nextcloud21;
+        package = pkgs.nextcloud22;
         config = {
           dbuser = "nextcloud";
           dbname = "nextcloud";