Update services to use id instead of _id