diff --git a/.gitmodules b/.gitmodules
index 06f552c..4d17134 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,3 +20,6 @@
 [submodule "external/solanaceae_plugin"]
 	path = external/solanaceae_plugin
 	url = https://github.com/Green-Sky/solanaceae_plugin.git
+[submodule "external/solanaceae_object_store"]
+	path = external/solanaceae_object_store
+	url = https://github.com/Green-Sky/solanaceae_object_store.git
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 59914ab..0daa5d9 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -12,6 +12,8 @@ add_subdirectory(./toxcore)
 add_subdirectory(./solanaceae_toxcore)
 add_subdirectory(./solanaceae_tox)
 
+add_subdirectory(./solanaceae_object_store)
+
 add_subdirectory(./sdl)
 add_subdirectory(./imgui)
 
diff --git a/external/solanaceae_object_store b/external/solanaceae_object_store
new file mode 160000
index 0000000..4d3ffb8
--- /dev/null
+++ b/external/solanaceae_object_store
@@ -0,0 +1 @@
+Subproject commit 4d3ffb8192623740f6e170855ee1cffd428b78da
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6328a18..2dc82cf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,6 +82,8 @@ target_link_libraries(tomato PUBLIC
 	solanaceae_tox_contacts
 	solanaceae_tox_messages
 
+	solanaceae_object_store
+
 	SDL3::SDL3
 
 	imgui
diff --git a/src/main_screen.cpp b/src/main_screen.cpp
index e84a2c9..7fcaf2b 100644
--- a/src/main_screen.cpp
+++ b/src/main_screen.cpp
@@ -49,6 +49,8 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::stri
 	std::cout << "own address: " << tc.toxSelfGetAddressStr() << "\n";
 
 	{ // setup plugin instances
+		g_provideInstance<ObjectStore2>("ObjectStore2", "host", &os);
+
 		g_provideInstance<ConfigModelI>("ConfigModelI", "host", &conf);
 		g_provideInstance<Contact3Registry>("Contact3Registry", "1", "host", &cr);
 		g_provideInstance<RegistryMessageModel>("RegistryMessageModel", "host", &rmm);
diff --git a/src/main_screen.hpp b/src/main_screen.hpp
index 27f7d7b..1ecc9cf 100644
--- a/src/main_screen.hpp
+++ b/src/main_screen.hpp
@@ -2,6 +2,7 @@
 
 #include "./screen.hpp"
 
+#include <solanaceae/object_store/object_store.hpp>
 #include <solanaceae/util/simple_config_model.hpp>
 #include <solanaceae/contact/contact_model3.hpp>
 #include <solanaceae/message3/registry_message_model.hpp>
@@ -43,6 +44,8 @@ extern "C" {
 struct MainScreen final : public Screen {
 	SDL_Renderer* renderer;
 
+	ObjectStore2 os;
+
 	SimpleConfigModel conf;
 	Contact3Registry cr;
 	RegistryMessageModel rmm;