Index: src/libchcore/TFileFilter.cpp
===================================================================
diff -u -N -r2fe97a93f21771d75901d4b6559057d1ea055104 -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834
--- src/libchcore/TFileFilter.cpp	(.../TFileFilter.cpp)	(revision 2fe97a93f21771d75901d4b6559057d1ea055104)
+++ src/libchcore/TFileFilter.cpp	(.../TFileFilter.cpp)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
@@ -20,8 +20,6 @@
 #include "TFileFilter.h"
 #include "TFileInfo.h"
 #include "TConfig.h"
-#include "TBinarySerializer.h"
-#include "SerializationHelpers.h"
 
 BEGIN_CHCORE_NAMESPACE
 
@@ -33,7 +31,7 @@
 }
 
 TFileFilter::TFileFilter() :
-	m_stObjectID(0),
+	m_oidObjectID(0),
 	m_setModifications(),
 	m_bUseMask(m_setModifications, false),
 	m_astrMask(m_setModifications),
@@ -70,7 +68,7 @@
 }
 
 TFileFilter::TFileFilter(const TFileFilter& rFilter) :
-	m_stObjectID(rFilter.m_stObjectID),
+	m_oidObjectID(rFilter.m_oidObjectID),
 	m_setModifications(rFilter.m_setModifications),
 	m_bUseMask(rFilter.m_bUseMask, m_setModifications),
 	m_astrMask(rFilter.m_astrMask, m_setModifications),
@@ -107,7 +105,7 @@
 	if(this == &rFilter)
 		return *this;
 
-	m_stObjectID = rFilter.m_stObjectID;
+	m_oidObjectID = rFilter.m_oidObjectID;
 	m_setModifications = rFilter.m_setModifications;
 
 	// files mask
@@ -538,7 +536,7 @@
 
 void TFileFilter::InitColumns(IColumnsDefinition& rColumns)
 {
-	rColumns.AddColumn(_T("id"), IColumnsDefinition::eType_ulonglong);
+	rColumns.AddColumn(_T("id"), ColumnType<object_id_t>::value);
 	rColumns.AddColumn(_T("use_mask"), IColumnsDefinition::eType_bool);
 	rColumns.AddColumn(_T("mask"), IColumnsDefinition::eType_string);
 	rColumns.AddColumn(_T("use_exclude_mask"), IColumnsDefinition::eType_bool);
@@ -573,7 +571,7 @@
 	bool bAdded = m_setModifications[eMod_Added];
 	if(m_setModifications.any())
 	{
-		ISerializerRowData& rRow = spContainer->GetRow(m_stObjectID, bAdded);
+		ISerializerRowData& rRow = spContainer->GetRow(m_oidObjectID, bAdded);
 
 		if(bAdded || m_setModifications[eMod_UseMask])
 			rRow.SetValue(_T("use_mask"), m_bUseMask);
@@ -674,14 +672,14 @@
 	m_setModifications.reset();
 }
 
-size_t TFileFilter::GetObjectID() const
+object_id_t TFileFilter::GetObjectID() const
 {
-	return m_stObjectID;
+	return m_oidObjectID;
 }
 
-void TFileFilter::SetObjectID(size_t stObjectID)
+void TFileFilter::SetObjectID(object_id_t oidObjectID)
 {
-	m_stObjectID = stObjectID;
+	m_oidObjectID = oidObjectID;
 }
 
 void TFileFilter::ResetModifications()