diff --git a/flake.lock b/flake.lock
index 8a3b49f..0dceb8a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -83,6 +83,26 @@
         "url": "https://codeberg.org/noe/doll.repair"
       }
     },
+    "fedi-emotes": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1713648847,
+        "narHash": "sha256-1nlurboQP8OH8ja4k4tH/l6ViJ49oehlA+xjxmzgV68=",
+        "ref": "refs/heads/main",
+        "rev": "1518968e7bdb99376b08885a19fb08bd27d32861",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://git.sapphic.engineer/noe/emotes"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.sapphic.engineer/noe/emotes"
+      }
+    },
     "flake-compat": {
       "locked": {
         "lastModified": 1688025799,
@@ -626,6 +646,7 @@
         "apple-silicon": "apple-silicon",
         "darwin": "darwin",
         "doll-repair": "doll-repair",
+        "fedi-emotes": "fedi-emotes",
         "home-manager": "home-manager",
         "iceshrimp": "iceshrimp",
         "iceshrimp-withdrawal": "iceshrimp-withdrawal",
diff --git a/flake.nix b/flake.nix
index 1987435..7a9d3b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,10 +58,10 @@
       url = "git+https://git.sapphic.engineer/noe/tachikoma";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # fedi-emotes = {
-    #   url = "git+https://git.sapphic.engineer/noe/emotes";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
+    fedi-emotes = {
+      url = "git+https://git.sapphic.engineer/noe/emotes";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   nixConfig = {
diff --git a/nixos/features/plasma6.nix b/nixos/features/plasma6.nix
index c7c4025..d8fc86e 100644
--- a/nixos/features/plasma6.nix
+++ b/nixos/features/plasma6.nix
@@ -8,6 +8,9 @@
   };
 
   services.displayManager = {
-    sddm.enable = true;
+    sddm = {
+      enable = true;
+      wayland.enable = true;
+    };
   };
 }
diff --git a/nixos/hosts/cider/default.nix b/nixos/hosts/cider/default.nix
index c618858..4ef2a63 100644
--- a/nixos/hosts/cider/default.nix
+++ b/nixos/hosts/cider/default.nix
@@ -11,6 +11,7 @@
     ../../features/tailscale.nix
     ../../features/bluetooth.nix
     ../../features/telemetry
+    ../../features/dns-cache.nix
   ];
   
   home-manager.users.noe = import ../../../home-manager/noe/hosts/cider.nix;
diff --git a/nixos/hosts/sapphic-engineer/akkoma.nix b/nixos/hosts/sapphic-engineer/akkoma.nix
index 6006064..c48262b 100644
--- a/nixos/hosts/sapphic-engineer/akkoma.nix
+++ b/nixos/hosts/sapphic-engineer/akkoma.nix
@@ -5,10 +5,10 @@
   }; 
   secrets = keys: builtins.listToAttrs (map (name: nameValuePair name defaultSecret) keys);
   secretRef = key: { _secret = config.sops.secrets.${key}.path; };
-  # fediEmotes = inputs.fedi-emotes.packages.${pkgs.system};
+  fediEmotes = inputs.fedi-emotes.packages.${pkgs.system};
 in {
   imports = [
-    inputs.tachikoma.nixosModules.default
+    # inputs.tachikoma.nixosModules.default
   ];
 
   sops.secrets = secrets [
@@ -185,8 +185,8 @@ in {
       #   '';
       # };
       "emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
-      # "emoji/hearts" = fediEmotes.lightrunner-custom.hearts;
-      # "emoji/anime" = fediEmotes.lightrunner-custom.anime;
+      "emoji/hearts" = fediEmotes.lightrunner-custom.hearts;
+      "emoji/anime" = fediEmotes.lightrunner-custom.anime;
       # "emoji/blobfox" = fediEmotes.volpeon.blobfox;
       # "emoji/neocat" = fediEmotes.volpeon.neocat;
       "static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" ''