Fixed block id locking in ichor tools