diff --git a/bsp_hosted/main.cpp b/bsp_hosted/main.cpp
index 6ffa5f8..26b4414 100644
--- a/bsp_hosted/main.cpp
+++ b/bsp_hosted/main.cpp
@@ -39,7 +39,6 @@ int main() {
     ObjectManager* objManager = ObjectManager::instance();
     objManager->setObjectFactoryFunction(ObjectFactory::produce, nullptr);
 
-
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::info << "Objects created successfully.." << std::endl;
     sif::info << "Initializing objects.." << std::endl;
diff --git a/bsp_linux/core/InitMission.cpp b/bsp_linux/core/InitMission.cpp
index 81ca23a..d74ba45 100644
--- a/bsp_linux/core/InitMission.cpp
+++ b/bsp_linux/core/InitMission.cpp
@@ -1,5 +1,5 @@
 #include "InitMission.h"
-#include <OBSWConfig.h>
+#include "OBSWConfig.h"
 
 #include <bsp_linux/fsfwconfig/objects/systemObjectList.h>
 #include <bsp_linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h>
@@ -216,7 +216,7 @@ void InitMission::createTasks() {
 
 
 #if OBSW_ADD_DEVICE_HANDLER_DEMO
-    HasModesIF* assembly = objectManager->get<HasModesIF>(objects::TEST_ASSEMBLY);
+    HasModesIF* assembly = ObjectManager::instance()->get<HasModesIF>(objects::TEST_ASSEMBLY);
     if (assembly == nullptr){
     	return;
     }
diff --git a/bsp_linux/core/ObjectFactory.cpp b/bsp_linux/core/ObjectFactory.cpp
index 0866c28..6a1fe59 100644
--- a/bsp_linux/core/ObjectFactory.cpp
+++ b/bsp_linux/core/ObjectFactory.cpp
@@ -20,7 +20,7 @@
 #include <fsfw/osal/common/UdpTmTcBridge.h>
 
 
-void ObjectFactory::produce() {
+void ObjectFactory::produce(void* args) {
     /* Located inside the GenericFactory source file */
 	Factory::setStaticFrameworkObjectIds();
 
diff --git a/bsp_linux/core/ObjectFactory.h b/bsp_linux/core/ObjectFactory.h
index 0d78319..1151a9e 100644
--- a/bsp_linux/core/ObjectFactory.h
+++ b/bsp_linux/core/ObjectFactory.h
@@ -4,7 +4,7 @@
 
 namespace ObjectFactory {
 	void setStatics();
-	void produce();
+	void produce(void* args);
 };
 
 #endif /* MISSION_CORE_OBJECTFACTORY_H_ */
diff --git a/bsp_linux/main.cpp b/bsp_linux/main.cpp
index 4437290..4696be2 100644
--- a/bsp_linux/main.cpp
+++ b/bsp_linux/main.cpp
@@ -39,7 +39,8 @@ int main() {
     sif::printInfo("Producing system objects..\n");
 #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
 
-    objectManager = new ObjectManager(ObjectFactory::produce);
+    ObjectManager* objManager = ObjectManager::instance();
+    objManager->setObjectFactoryFunction(ObjectFactory::produce, nullptr);
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::info << "Objects created successfully.." << std::endl;
@@ -48,7 +49,7 @@ int main() {
     sif::printInfo("Objects created successfully..\n");
 #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
 
-    objectManager->initialize();
+    objManager->initialize();
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::info << "Creating tasks.." << std::endl;
diff --git a/fsfw b/fsfw
index 50fac22..145dd33 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 50fac22f54031e409306931e15d2e63426aa03b2
+Subproject commit 145dd33fb1e467ef7370ccd44671a91d96c60e26