diff --git a/tcdistribution/CFDPDistributor.cpp b/tcdistribution/CFDPDistributor.cpp
index 245fece2..b344f7bb 100644
--- a/tcdistribution/CFDPDistributor.cpp
+++ b/tcdistribution/CFDPDistributor.cpp
@@ -1,6 +1,8 @@
+
 #include "CCSDSDistributorIF.h"
 #include "CFDPDistributor.h"
 
+#include "../objectmanager/ObjectManager.h"
 #include "../serviceinterface/ServiceInterface.h"
 
 #define CFDP_DISTRIBUTOR_DEBUGGING     0
@@ -19,7 +21,8 @@ CFDPDistributor::TcMqMapIter CFDPDistributor::selectDestination() {
     sif::debug << "CFDPDistributor::handlePacket received: " << storeId.poolIndex << ", " <<
             storeId.packetIndex << std::endl;
 #else
-    sif::printDebug("CFDPDistributor::handlePacket received: %d, %d\n", storeId.poolIndex, storeId.packetIndex);
+    sif::printDebug("CFDPDistributor::handlePacket received: %d, %d\n", storeId.poolIndex,
+            storeId.packetIndex);
 #endif
 #endif
     TcMqMapIter queueMapIt = this->queueMap.end();
@@ -120,14 +123,14 @@ uint16_t CFDPDistributor::getIdentifier() {
 }
 
 ReturnValue_t CFDPDistributor::initialize() {
-    currentPacket = new TcPacketStored();
+    currentPacket = new TcPacketStoredPus();
     if(currentPacket == nullptr) {
         // Should not happen, memory allocation failed!
         return ObjectManagerIF::CHILD_INIT_FAILED;
     }
 
-    CCSDSDistributorIF* ccsdsDistributor =
-            objectManager->get<CCSDSDistributorIF>(packetSource);
+    CCSDSDistributorIF* ccsdsDistributor = ObjectManager::instance()->get<CCSDSDistributorIF>(
+            packetSource);
     if (ccsdsDistributor == nullptr) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
         sif::error << "CFDPDistributor::initialize: Packet source invalid" << std::endl;
diff --git a/tcdistribution/CFDPDistributor.h b/tcdistribution/CFDPDistributor.h
index 1a5865ed..ae5df11d 100644
--- a/tcdistribution/CFDPDistributor.h
+++ b/tcdistribution/CFDPDistributor.h
@@ -5,6 +5,7 @@
 #include "TcDistributor.h"
 #include "TcPacketCheck.h"
 
+#include "../tmtcpacket/pus/tc.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../tmtcservices/AcceptsTelecommandsIF.h"
 #include "../tmtcservices/VerificationReporter.h"
@@ -50,7 +51,7 @@ protected:
 	/**
 	 * The currently handled packet is stored here.
 	 */
-	TcPacketStored* currentPacket = nullptr;
+	TcPacketStoredPus* currentPacket = nullptr;
 	/**
 	 * With this variable, the current check status is stored to generate
 	 * acceptance messages later.
diff --git a/tcdistribution/CMakeLists.txt b/tcdistribution/CMakeLists.txt
index 40fcc81a..359b8a81 100644
--- a/tcdistribution/CMakeLists.txt
+++ b/tcdistribution/CMakeLists.txt
@@ -3,6 +3,6 @@ target_sources(${LIB_FSFW_NAME} PRIVATE
     PUSDistributor.cpp
     TcDistributor.cpp
     TcPacketCheck.cpp
-    CCSDSDistributor.cpp
+    CFDPDistributor.cpp
 )