Is there a better way to write this QueryBuilder?

public static class IQueryableExtensions
{
    private static Expression<Func<TEntity, bool>> EntityPropExpr<TEntity>(Expression navigationSelector, Func<InvocationExpression, BinaryExpression> binaryExpressionGetter)
    {
        // Create a parameter for TEntity (entity)
        var entityParameter = Expression.Parameter(typeof(TEntity), "entity");

        // Access the prop from the navigation selector
        var entityExpression = Expression.Invoke(navigationSelector, entityParameter);

        var binaryExpression = binaryExpressionGetter(entityExpression);

        // Build the lambda expression
        return Expression.Lambda<Func<TEntity, bool>>(binaryExpression, entityParameter);
    }

    private static BinaryExpression UserIdMatchesExpr(InvocationExpression userExpression, Guid userId)
    {
        return Expression.Equal(
            Expression.Property(userExpression, nameof(OpenShockDb.User.Id)),
            Expression.Constant(userId)
        );
    }

    private static Expression<Func<TEntity, bool>> IsUserMatchExpr<TEntity>(Expression navigationSelector, Guid userId)
    {
        return EntityPropExpr<TEntity>(navigationSelector, user => UserIdMatchesExpr(user, userId));
    }

    public static IQueryable<TEntity> WhereIsUser<TEntity>(this IQueryable<TEntity> source, Expression navigationSelector, Guid userId)
    {
        return source.Where(IsUserMatchExpr<TEntity>(navigationSelector, userId));
    }
}

public static class IQueryableExtensions
{
    private static Expression<Func<TEntity, bool>> EntityPropExpr<TEntity>(Expression navigationSelector, Func<InvocationExpression, BinaryExpression> binaryExpressionGetter)
    {
        // Create a parameter for TEntity (entity)
        var entityParameter = Expression.Parameter(typeof(TEntity), "entity");

        // Access the prop from the navigation selector
        var entityExpression = Expression.Invoke(navigationSelector, entityParameter);

        var binaryExpression = binaryExpressionGetter(entityExpression);

        // Build the lambda expression
        return Expression.Lambda<Func<TEntity, bool>>(binaryExpression, entityParameter);
    }

    private static BinaryExpression UserIdMatchesExpr(InvocationExpression userExpression, Guid userId)
    {
        return Expression.Equal(
            Expression.Property(userExpression, nameof(OpenShockDb.User.Id)),
            Expression.Constant(userId)
        );
    }

    private static Expression<Func<TEntity, bool>> IsUserMatchExpr<TEntity>(Expression navigationSelector, Guid userId)
    {
        return EntityPropExpr<TEntity>(navigationSelector, user => UserIdMatchesExpr(user, userId));
    }

    public static IQueryable<TEntity> WhereIsUser<TEntity>(this IQueryable<TEntity> source, Expression navigationSelector, Guid userId)
    {
        return source.Where(IsUserMatchExpr<TEntity>(navigationSelector, userId));
    }
}