diff --git a/lib/utils/database/cipher_db.dart b/lib/utils/database/cipher_db.dart
index 11b54f0..66863f0 100644
--- a/lib/utils/database/cipher_db.dart
+++ b/lib/utils/database/cipher_db.dart
@@ -6,9 +6,9 @@ import 'dart:io';
 import 'dart:math';
 
 import 'package:moor/backends.dart';
+import 'package:moor/ffi.dart';
 import 'package:moor/moor.dart';
-import 'package:moor_ffi/moor_ffi.dart';
-import 'package:moor_ffi/open_helper.dart';
+import 'package:sqlite3/open.dart';
 
 /// Tells `moor_ffi` to use `sqlcipher` instead of the regular `sqlite3`.
 ///
diff --git a/lib/utils/famedlysdk_store.dart b/lib/utils/famedlysdk_store.dart
index 0dc906c..714e649 100644
--- a/lib/utils/famedlysdk_store.dart
+++ b/lib/utils/famedlysdk_store.dart
@@ -186,7 +186,9 @@ Future<void> migrate(String clientName, Database db, Store store) async {
               entry.key,
               entry.value['inboundGroupSession'],
               json.encode(entry.value['content']),
-              json.encode(entry.value['indexes']));
+              json.encode(entry.value['indexes']),
+              null,
+              null);
         }
       }
     }
diff --git a/pubspec.lock b/pubspec.lock
index 6641497..54674c8 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -180,8 +180,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "50d97ebeb224dcbfa8e306b8cb50adcaee12d4db"
-      resolved-ref: "50d97ebeb224dcbfa8e306b8cb50adcaee12d4db"
+      ref: "09ffa0940484862139c3fe431d4c3ef3392f2232"
+      resolved-ref: "09ffa0940484862139c3fe431d4c3ef3392f2232"
       url: "https://gitlab.com/famedly/famedlysdk.git"
     source: git
     version: "0.0.1"
@@ -502,14 +502,7 @@ packages:
       name: moor
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.0"
-  moor_ffi:
-    dependency: "direct main"
-    description:
-      name: moor_ffi
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.5.0"
+    version: "3.3.1"
   node_interop:
     dependency: transitive
     description:
@@ -768,7 +761,7 @@ packages:
     source: hosted
     version: "1.0.2+1"
   sqlite3:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: sqlite3
       url: "https://pub.dartlang.org"
diff --git a/pubspec.yaml b/pubspec.yaml
index 6fd5c02..bad17d4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,7 +27,7 @@ dependencies:
   famedlysdk:
     git:
       url: https://gitlab.com/famedly/famedlysdk.git
-      ref: 50d97ebeb224dcbfa8e306b8cb50adcaee12d4db
+      ref: 09ffa0940484862139c3fe431d4c3ef3392f2232
 
   localstorage: ^3.0.1+4
   bubble: ^1.1.9+1
@@ -58,17 +58,15 @@ dependencies:
     git:
       url: https://github.com/Sorunome/flutter_matrix_html
       ref: 530df434b50002e04cbad63f53d6f0f5d5adbab5
-  moor: ^3.0.2
+  moor: ^3.3.1
+  sqlite3: ^0.1.4
   random_string: ^2.0.1
   flutter_typeahead: ^1.8.1
   flutter_olm: ^1.0.1
-
   intl: ^0.16.0
   intl_translation: ^0.17.9
   flutter_localizations:
     sdk: flutter
-
-  moor_ffi: ^0.5.0 # 0.6.0 and  up have a bug that it doesn't build with --profile, see https://github.com/simolus3/moor/issues/581
   sqflite: ^1.1.7 # Still used to obtain the database location
 
 dev_dependencies: