--- a/src/helper/point-to-point-helper.cc	Tue Mar 25 17:02:14 2008 -0700
+++ b/src/helper/point-to-point-helper.cc	Tue Mar 25 17:13:32 2008 -0700
@@ -51,17 +51,17 @@
 {
   NetDeviceContainer container;
 
-  Ptr<PointToPointNetDevice> devA = CreateObject<PointToPointNetDevice> ();
+  Ptr<PointToPointNetDevice> devA = m_deviceFactory.Create<PointToPointNetDevice> ();
   devA->SetAddress (Mac48Address::Allocate ());
   a->AddDevice (devA);
   Ptr<Queue> queueA = m_queueFactory.Create<Queue> ();
   devA->AddQueue (queueA);
-  Ptr<PointToPointNetDevice> devB = CreateObject<PointToPointNetDevice> ();
+  Ptr<PointToPointNetDevice> devB = m_deviceFactory.Create<PointToPointNetDevice> ();
   devB->SetAddress (Mac48Address::Allocate ());
   b->AddDevice (devB);
   Ptr<Queue> queueB = m_queueFactory.Create<Queue> ();
   devB->AddQueue (queueB);
-  Ptr<PointToPointChannel> channel = CreateObject<PointToPointChannel> ();
+  Ptr<PointToPointChannel> channel = m_channelFactory.Create<PointToPointChannel> ();
   devA->Attach (channel);
   devB->Attach (channel);
   container.Add (devA);