LIVEOAK-706: Update to use resource.id instead of resource.properties.id