diff --git a/modules/fedi/default.nix b/modules/fedi/default.nix
index 3baf31e..c46502a 100644
--- a/modules/fedi/default.nix
+++ b/modules/fedi/default.nix
@@ -15,10 +15,11 @@
   blobhaj = pkgs.callPackage ./blobhaj.nix {};
   blobhajFlags = pkgs.callPackage ./blobhajFlags.nix {};
   favicon = pkgs.callPackage ./favicon.nix {};
-  iceshrimp = pkgs.callPackage ./iceshrimp/iceshrimp.nix {};
-in
-  mkIf cfg.enable {
-    environment.systemPackages = [iceshrimp];
+in {
+  imports = [
+    ./iceshrimp
+  ];
+  config = mkIf cfg.enable {
     services.akkoma = {
       enable = true;
       frontends.primary = {
@@ -74,4 +75,5 @@ in
         forceSSL = true;
       };
     };
-  }
+  };
+}
diff --git a/modules/fedi/iceshrimp/default.nix b/modules/fedi/iceshrimp/default.nix
index ea8f50d..e062681 100644
--- a/modules/fedi/iceshrimp/default.nix
+++ b/modules/fedi/iceshrimp/default.nix
@@ -1,2 +1,13 @@
-{...}: {
-}
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: let
+  inherit (lib) mkIf;
+  cfg = config.conf.fedi;
+  iceshrimp = pkgs.callPackage ./iceshrimp.nix {};
+in
+  mkIf cfg.enable {
+    environment.systemPackages = [iceshrimp];
+  }
diff --git a/modules/fedi/iceshrimp/iceshrimp.nix b/modules/fedi/iceshrimp/iceshrimp.nix
index 31036de..9606cf5 100644
--- a/modules/fedi/iceshrimp/iceshrimp.nix
+++ b/modules/fedi/iceshrimp/iceshrimp.nix
@@ -1,21 +1,31 @@
 {
   stdenv,
-  fetchFromGitea,
+  fetchurl,
+  zstd,
+  gnutar,
 }: let
   version = "v2025.1-beta5.patch2.security1";
 in
   stdenv.mkDerivation {
     name = "iceshrimp";
-    src = fetchFromGitea {
-      domain = "https://iceshrimp.dev";
-      owner = "iceshrimp";
-      repo = "Iceshrimp.NET";
-      rev = version;
-      hash = "";
+    src = fetchurl {
+      url = "https://iceshrimp.dev/iceshrimp/Iceshrimp.NET/releases/download/v2025.1-beta5.patch2.security1/Iceshrimp.NET-${version}-linux-amd64-glibc.tar.zst";
+      hash = "sha256-Uwstie81M3kM9CjukIG+wXpxp91uTuXFMB/fZlFWsMk=";
     };
 
-    installPhase = ''
+    nativeBuildInputs = [
+      zstd
+      gnutar
+    ];
+
+    unpackPhase = ''
+      runHook preUnpack
+
       mkdir -p $out
-      make
+
+      tar xf $src
+      cp -r * $out
+
+      runHook postUnpack
     '';
   }
diff --git a/modules/fedi/iceshrimp/result b/modules/fedi/iceshrimp/result
deleted file mode 120000
index f3a81e3..0000000
--- a/modules/fedi/iceshrimp/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/q9acxpqrgfwrra5agyzx8q6lic5lwjki-iceshrimp.drv
\ No newline at end of file