diff --git a/pkgs/by-name/ka/kazv/package.nix b/pkgs/by-name/ka/kazv/package.nix
index bdb82fadac73..c993bb727046 100644
--- a/pkgs/by-name/ka/kazv/package.nix
+++ b/pkgs/by-name/ka/kazv/package.nix
@@ -1,18 +1,16 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
+  fetchgit,
   boost,
   cmake,
   cmark,
   cryptopp,
-  extra-cmake-modules,
   immer,
   kdePackages,
   lager,
   libkazv,
   nlohmann_json,
-  olm,
   pkg-config,
   qt6,
   zug,
@@ -20,14 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kazv";
-  version = "0.5.0";
+  version = "0.6.0";
 
-  src = fetchFromGitLab {
-    domain = "lily-is.land";
-    owner = "kazv";
-    repo = "kazv";
+  # Heavily mirrored. Click "Clone" at https://iron.lily-is.land/diffusion/K/ to see all mirrors
+  src = fetchgit {
+    url = "https://iron.lily-is.land/diffusion/K/kazv.git";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WBS7TJJw0t57V4+NxsG8V8q4UKQXB8kRpWocvNy1Eto=";
+    hash = "sha256-7o6xUt/cryOg71/R33VBGpubskqlm9eYGSTyoGderDA=";
   };
 
   nativeBuildInputs = [
@@ -49,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
     lager
     libkazv
     nlohmann_json
-    olm
     qt6.qtbase
     qt6.qtimageformats
     qt6.qtmultimedia
diff --git a/pkgs/by-name/li/libkazv/package.nix b/pkgs/by-name/li/libkazv/package.nix
index e17533314b4c..80deb93ca028 100644
--- a/pkgs/by-name/li/libkazv/package.nix
+++ b/pkgs/by-name/li/libkazv/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
+  fetchgit,
   boost,
   catch2_3,
   cmake,
@@ -12,21 +12,20 @@
   libhttpserver,
   libmicrohttpd,
   nlohmann_json,
-  olm,
+  vodozemac-bindings-cpp,
   pkg-config,
   zug,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libkazv";
-  version = "0.7.0";
+  version = "0.8.0";
 
-  src = fetchFromGitLab {
-    domain = "lily-is.land";
-    owner = "kazv";
-    repo = "libkazv";
+  # Heavily mirrored. Click "Clone" at https://iron.lily-is.land/diffusion/L/ to see all mirrors
+  src = fetchgit {
+    url = "https://iron.lily-is.land/diffusion/L/libkazv.git";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bKujiuAR5otF7nc/BdVWVaEW9fSxdh2bcAgsQ5UO1Aw=";
+    hash = "sha256-rXQLbYPmD9UH0iXXqrAQSPF3KgIvjEyZ/97Q+/tl9Ec=";
   };
 
   nativeBuildInputs = [
@@ -42,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
     libcpr_1_10_5
     libhttpserver
     libmicrohttpd
-    olm
     nlohmann_json
+    vodozemac-bindings-cpp
     zug
   ];
 
diff --git a/pkgs/by-name/vo/vodozemac-bindings-cpp/package.nix b/pkgs/by-name/vo/vodozemac-bindings-cpp/package.nix
new file mode 100644
index 000000000000..2162086118ae
--- /dev/null
+++ b/pkgs/by-name/vo/vodozemac-bindings-cpp/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  fetchgit,
+  cargo,
+  perl,
+  rustPlatform,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vodozemac-bindings-cpp";
+  version = "0.2.1";
+
+  src = fetchgit {
+    url = "https://iron.lily-is.land/diffusion/VB/vodozemac-bindings.git";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-j6s+O3s6xSIZ+6aWI3itVwL4OU4qhoXos1R2NMBrJdo=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-RyZGR6VxWH98ujydPFbuzKZil+1pxk4qD6EuaCnN1Y8=";
+  };
+
+  makeFlags = [
+    "-C"
+    "cpp"
+    "PREFIX=${placeholder "out"}"
+  ];
+
+  nativeBuildInputs = [
+    cargo
+    perl
+    rustPlatform.cargoSetupHook
+  ];
+
+  meta = {
+    description = "C++ bindings for the vodozemac cryptographic library.";
+    homepage = "https://iron.lily-is.land/diffusion/VB/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.all;
+  };
+})