Principal->ObjectId was deprecated in f70178f

Switch to using Principal->Id as suggested.